Redirect legacy Dev Wiki /code.ext imports to .ext by speeditor · Pull Request #16235 · Wikia/app

speeditor · 2018-10-18T15:49:24Z

Per Slack conversation with @Grunny & @KockaAdmiralac. Also prevents hardcoding of $wgScript in importScriptPage function.

mszabo-wikia

might be worth to add a test for the logic:

it entails adding both the file housing the code to be tested + the test file to https://github.com/Wikia/app/blob/dev/tests/karma/js-unit.conf.js
existing tests like https://github.com/Wikia/app/blob/dev/extensions/wikia/GlobalShortcuts/scripts/spec/PageActions.spec.js can be an inspiration
tests can be run by running npm test (after fetching the dependencies)

…lesheet URLs and respect wgScriptPath in their imports as well

KockaAdmiralac

@mszabo-wikia I added tests now (based on BannerNotifications.spec.js), does it look okay and should I cover more code in it?

KockaAdmiralac · 2018-10-19T08:40:31Z

skins/common/wikibits.js

 };

-// Special stylesheet links for Monobook only (see bug 14717)
-var skinpath = mw.config.get( 'stylepath' ) + '/' + mw.config.get( 'skin' );


These aren't used anymore and don't seem like they will cause issues for custom scripts.

KockaAdmiralac · 2018-10-19T08:47:10Z

skins/common/wikibits.js

 	return false;
 }

-if (skin != 'monaco' && skin != 'oasis') {


This never executes anymore.

KockaAdmiralac · 2018-10-19T08:56:34Z

skins/common/wikibits.js

+			// Check protocol-relative, HTTP and HTTPS versions of Dev Wiki links
+			// This is done via wgWikiaBaseDomain so fandom.com migration does
+			// not affect it and can't use wgWikiaBaseDomainRegex so it does
+			// not potentially affect devbox URLs such as dev.wikia-dev.pl


Any ideas for smarter implementation of this? Will using wgWikiaBaseDomain still be an issue after the fandom.com migration?

I would consider using wgWikiaBaseDomainRegex instead to cover both domains.

That will also cover URLs like dev.wikia-dev.pl. Is that an issue?

Nope, that's fine, makes it easier to have the same behaviour in our development environment too. :)

@Grunny changed in 257bffd.

KockaAdmiralac · 2018-10-19T09:00:56Z

skins/common/spec/wikibits.spec.js

+describe('wikibits', function() {
+	'use strict';
+	mw.config = new mw.Map();
+	var url1 = '/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';


Is there any smarter way of storing all these URLs?

Generally I wouldn't store them using names url1, url2 etc..., those names lack context and they should be at least named according to what they store. Going further maybe a good idea would be to set a map like:
{
'UserTagsCodeJsRelative': {
'CodePartRemoved': '....',
'CodePartRemovedWithDomain':'....'
}
}
Using those keys should be easier to read and there would be no need to look for the values.

…rs/app into devwiki-codejs-redirect

stale · 2018-11-27T12:49:56Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

stale · 2018-12-27T13:37:22Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

speeditor · 2019-03-07T08:21:52Z

Couple months late, but public note of technical blockers:

Fandom importArticles doesn't support JS redirecting (Engineering)
Community consent for template default update (Dev forum)

abador · 2019-05-15T12:33:38Z

skins/common/spec/wikibits.spec.js

+	var url1expect = '/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';
+	var url1expect2 = '//dev.wikia.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';
+	var url2 = '/index.php?title=User:TK-999/common.js&action=raw&ctype=text/javascript';
+	var url3 = 'http://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';


dev.wikia.com is moved to dev.fandom.com, also fandom.com works on https

Suggested change

var url3 = 'http://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

var url3 = 'https://dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

abador · 2019-05-15T12:36:33Z

skins/common/spec/wikibits.spec.js

+	mw.config = new mw.Map();
+	var url1 = '/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
+	var url1expect = '/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';
+	var url1expect2 = '//dev.wikia.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';


Suggested change

var url1expect2 = '//dev.wikia.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';

var url1expect2 = '//dev.fandom.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';

abador · 2019-05-15T12:36:51Z

skins/common/spec/wikibits.spec.js

+	var url1expect2 = '//dev.wikia.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';
+	var url2 = '/index.php?title=User:TK-999/common.js&action=raw&ctype=text/javascript';
+	var url3 = 'http://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
+	var url3expect = '//dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';


Suggested change

var url3expect = '//dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

var url3expect = '//dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

abador · 2019-05-15T12:37:27Z

skins/common/spec/wikibits.spec.js

+	var url2 = '/index.php?title=User:TK-999/common.js&action=raw&ctype=text/javascript';
+	var url3 = 'http://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
+	var url3expect = '//dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
+	var url4 = 'https://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';


Suggested change

var url4 = 'https://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

var url4 = 'https://dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

abador · 2019-05-15T12:37:49Z

skins/common/spec/wikibits.spec.js

+	var url5 = 'http://platform.twitter.com/widgets.js';
+	var url6 = '/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';
+	var url6expect = '/index.php?title=MediaWiki:WikiaNavigationBarStyle.css&action=raw&ctype=text/css';
+	var url7 = 'http://dev.wikia.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';


Suggested change

var url7 = 'http://dev.wikia.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';

var url7 = 'https://dev.fandom.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';

abador · 2019-05-15T12:38:39Z

skins/common/spec/wikibits.spec.js

+	var url7expect = '//dev.wikia.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';
+	var url7expect2 = '//dev.wikia.com/index.php?title=MediaWiki:WikiaNavigationBarStyle.css&action=raw&ctype=text/css';
+	var url8 = 'http://platform.twitter.com/widgets.css';
+	var url9 = '//kocka.wikia.com/index.php?title=MediaWiki:UncategorizedFileListing/code.js&action=raw&ctype=text/javascript';


Suggested change

var url9 = '//kocka.wikia.com/index.php?title=MediaWiki:UncategorizedFileListing/code.js&action=raw&ctype=text/javascript';

var url9 = '//kocka.fandom.com/index.php?title=MediaWiki:UncategorizedFileListing/code.js&action=raw&ctype=text/javascript';

abador · 2019-05-15T12:58:12Z

skins/common/spec/wikibits.spec.js

+describe('wikibits', function() {
+	'use strict';
+	mw.config = new mw.Map();
+	var url1 = '/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';


Generally I wouldn't store them using names url1, url2 etc..., those names lack context and they should be at least named according to what they store. Going further maybe a good idea would be to set a map like:
{
'UserTagsCodeJsRelative': {
'CodePartRemoved': '....',
'CodePartRemovedWithDomain':'....'
}
}
Using those keys should be easier to read and there would be no need to look for the values.

abador · 2019-05-15T13:14:55Z

skins/common/spec/wikibits.spec.js

+/*global describe, it, expect*/
+describe('wikibits', function() {
+	'use strict';
+	mw.config = new mw.Map();


I think that it is reset everywhere like in line :40 , so it's not needed

abador · 2019-05-15T13:18:07Z

skins/common/wikibits.js

-window.importStylesheetURI = function( url, media ) {
-	var l = document.createElement( 'link' );
+window.importStylesheetURI = function(url, media) {
+	var l = document.createElement('link');


               	l.rel = 'stylesheet';
               	l.href = maybeMakeProtocolRelative(url);
-              	if( media ) {
+              	if (media) {

	var url3 = 'http://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
	var url3 = 'https://dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

	var url1expect2 = '//dev.wikia.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';
	var url1expect2 = '//dev.fandom.com/index.php?title=MediaWiki:UserTags.js&action=raw&ctype=text/javascript';

	var url3expect = '//dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
	var url3expect = '//dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

	var url4 = 'https://dev.wikia.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';
	var url4 = 'https://dev.fandom.com/index.php?title=MediaWiki:UserTags/code.js&action=raw&ctype=text/javascript';

	var url7 = 'http://dev.wikia.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';
	var url7 = 'https://dev.fandom.com/index.php?title=MediaWiki:WikiaNavigationBarStyle/code.css&action=raw&ctype=text/css';

	var url9 = '//kocka.wikia.com/index.php?title=MediaWiki:UncategorizedFileListing/code.js&action=raw&ctype=text/javascript';
	var url9 = '//kocka.fandom.com/index.php?title=MediaWiki:UncategorizedFileListing/code.js&action=raw&ctype=text/javascript';

Conversation

speeditor commented Oct 18, 2018

Uh oh!

mszabo-wikia left a comment

Choose a reason for hiding this comment

Uh oh!

KockaAdmiralac left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KockaAdmiralac Oct 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stale bot commented Nov 27, 2018

Uh oh!

stale bot commented Dec 27, 2018

Uh oh!

speeditor commented Mar 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

KockaAdmiralac left a comment •

edited

Loading

KockaAdmiralac Oct 19, 2018 •

edited

Loading

speeditor commented Mar 7, 2019 •

edited

Loading